Merge feature/nux_improvements into develop

This is the first step of NUX improvements, second step focus on NUX simplification. No need for a code review here, that just needs to be tested.