Copiedfrom 9.44 version