fixed problems with merge of tiling feature
Merge branch 'hotfix-1.2'