Fix whitelisted makes.
Merge remote-tracking branch 'origin/1.1.3' into development