#590 Added more options to mod_img module
Merege with development
Merge branch 'dev/j3/common' into dev/j3/free