Merge branch 'next' into wot-integration