I have re-rolled the patch #61, for 11.x-dev. please review