Some more debugging for creation.
Merge branch 'test' into dev