Bug fix #420
Bug fix #423
Bug fix #341
Bug fix #377
Bug fix #359
Merge branch 'Upstream/master'