core branch: fix merge oops
Merge remote-tracking branch 'origin/core' into headless