Final commit, might need some hot-fix.
approved this merge request
merged
mentioned in commit bb2e04ab