t4 output quirk
Merge branch 'release/3.4.0-beta' into dev