Merge branch 'pw/maint-p4-rcs-expansion-newline'