Dmytro Bondar, feel free to add more details to this jira. 3.1 branch is no longer being maintained. Any improvements would need to be made to 5.2.x (currently master branch).