Backport of Create 6 features for Create 0.5.1.j
Initial backport
Reference commit: e0c859a9
paring
Member