EZP-21675: blocks ignore limitations

(cherry picked from commit b2b386a01bbd2971294ed4bd0f60ef0d4c37ff66)