BZ971531 changes related to productization