Next master merge

Fix some conflicts between master and next to allow merging next release.

No functional changes (just one empty line). Will merge when jenkins says ok.