(RM-934 from redmine: created on 2013-11-04 by Marc Zinnschlag, , closed on 2014-07-03 by Marc Zinnschlag)