Update from upstream master
Merge branch 'UpstreamMaster'
merge error fixed