Merge branch 'pu/103-support-plain-maven-builds' into next
Merge branch 'pu/104-common-modeling' into next