Merge remote-tracking branch 'origin/listimage_fix'
Merge branch 'develop'
Release: v1.13
Merge branch 'master' into develop