Merge branch 'ld/p4-submit-hint'