Merge "Prepare for release build"