Fixed issue with building offical build and qa changes