Code style
Merge pull request #1869 from piotr-cz/cs_JImage

CS: JImage
Merge remote-tracking branch 'remotes/upstream/master' into jux-rebased
Merge remote-tracking branch 'remotes/upstream/master' into jux-rebased
Merge remote-tracking branch 'remotes/jux/jux-rebased' into jux-layout-items
Merge remote-tracking branch 'remotes/jux/jux-rebased' into jux-layout-items