Same as ~~HHH-6950~~ that has not been fixed in the 3.6-branch

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira