Merge branch 'os/preserve-author' into pu