added patch until pull request merged from connect 2.9.0