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