Fixed #1692
Merge branch 'master' into workshop