Incorporated latest changes in build