Merge "Add build number" into main