1.6.1 build failure fix.
Merge remote-tracking branch 'origin/hotfix-1.6.1' into hotfix-1.6.1