Fix build errors
Merge remote-tracking branch 'origin/master' into master