PM-787 partial commit last time around