Merge branch 'next' into  master

Merge material staged for 5.17 cycle.