BF-615: Reduce memory usage on 32-bit systems even more
Merge remote-tracking branch 'upstream/master'