Remaining pieces from !990 (closed)
I cannot (and don't want to) push to @MichalTomaszewski branch.
http://redmine.digitalstrom.org/issues/19431
