WIP general: merge branch 'master' into next