backport of v51bsupportos-1549-tpb 


