CMS-2636 Make input type Image work
Merge remote-tracking branch 'origin/master' into CMS-2574