Merge remote-tracking branch 'regulator/fix/core' into tmp