Merge branch 'vk/p4-submit-shelve'