Redmine #1098 (rev. 1)