Performance fixes

Collection task for performance fixes

(from redmine: issue id 61, created on 2018-01-22tgradl, closed on 2018-01-22)

• Relations:
  • relates #25 (closed)