Redmine issue - 2135 -> [Bug-fix]