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