general: merge fixes

* NOTE This commit is fixing biggest problems after merging 500+ commits
  from `master` to `next`. More commits with feature ports and bugfixes
  will follow.

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>