patches for issue 10290 and 11944 added