Data limits (on 1.3.x)

A version of #854 based on v1.3.x