Fied bug in image creation.
Merge branch 'test' into dev
Build.