Merge branch 'shipit-backup' into shipit