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