The x bits were correct after all.
Merge remote-tracking branch 'origin/master' into ospalh-special