NoIssue - Release 2019 1 clean rebase from current 2018-5

Due a quite relevant amount of underlying changes, and after failing already few times trying to rebase all necessary things properly, I've decided to create a regular Merge Request so we'll have track of all the rebased changes into a single commit, and see eventual regressions, or issues, caused by such rebase.