(#1533) - maxlen small squashed

@vw52 I did `git merge --squash` on your commits, could you let me know if it looks correct to you? Then you can merge it into your branch.