Cherry pick increased memory limits change to release/0.19

Morris Esteparequested to merge
cherry-pick-c4223e91 into release/0.19

Original merge !640 (merged)

Edited by Chad Leong

Merge request reports