Carried over some fixes from GTC development
Merge remote-tracking branch 'origin/GTC' into testing
Reverted changes to default settings from GTC branch after merge.