Merge branch 'dc/p4-binary-submit-fix'