646-Template image is not saved on Version 13.05
Merge branch 'development' into dev/j2/free