Trying to solve the header autosave issue -- won't promote until MP gives the sign-off to ensure existing functionality is not affected...
Merge branch 'staging' into wpa