Fixing for qa server.
Merge branch 'master' into release