Merge branch 'release/1.0.0/2'
Fixed bug due to change of image property name
Merge branch 'release/1.0.1/1' into develop