Merge remote-tracking branch 'regulator/topic/mc13892' into v3.9-rc8