Respect maximum size.
Merge branch 'maximum-size' into develop