* Fixed bugreport:7844 (merged from Hercules:e3761a8)