merge build.release changes