Probable fix for #1406
Merge branch 'master' into workshop
Fixed #1410
Merge branch 'master' into workshop