Merge commit 'jk/renamelimit^1' into next