deploy settings tweaks
Merge remote branch 'origin/usfw2' into usfw2