ESSENTIALS-368: first steps.
Make things work.
Remaining labels and consistency.
Merge branch 'master' into ESSENTIALS-368