Changes to build process in order to comply with U14.10.