US771:Fixing font and space issues
Merge remote-tracking branch 'origin/integration' into integration