Merge commit 'eba188e21c752d98f03215eb15822bd39c462664' * commit 'eba188e21c752d98f03215eb15822bd39c462664': Various tweaks to try to improve low memory behavior.
Merge commit 'eba188e21c752d98f03215eb15822bd39c462664' * commit 'eba188e21c752d98f03215eb15822bd39c462664': Various tweaks to try to improve low memory behavior.