Merge branch 'jk/renamelimit' (early part)