5.2 Hotfix
Merge remote-tracking branch 'upstream/master'

merge upstream