Merge pull request #2001 from glushchenko/subfolder-fixes

Subfolder fixes

#1971

#1962

#1941

#1941

#1888

Merge pull request #1937 from glushchenko/hotfix-pins

- Fixed an issue with printing images

#1928

- crash fix

- fixes missed i18n