Merge branch '3285-limits-check-fails' into 'master'

Resolve "limits check fails"

Closes #3285 (closed)

See merge request !4528 (merged)

(cherry picked from commit 04dee6ec)

8137cb2a fix issue #3285 (closed) + test