Merge "Remove make code for boot.zip" into main