Merge branch 'master' into fix-empty-undef-edit