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