Merge branch 'eg/p4-submit-catch-failure' into maint