Merge branch 'mt/p4-parse-G-output'