Merge "Use build number from file"