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