fixed 967
Merge remote-tracking branch 'upstream/hotfixes' into hotfixes