Merge branch 'bk/p4-prepare-p4-only-fix'