merging lifetime patch from 7_2_X