Merge branch 'ld/p4-update-shelve'