Merge "Add build flag for container builds"