Creation is now locked throuout image install.
Merge branch 'test' into dev