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