Complete implementation as necessary for workshop (bugs & minor features)

- collect remaining issues under this task and start implementing

  • move the remainder of the issues to either v2.2 for public release or X.x for non-pressing tasks

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