Reduce available the number of Elements to reduce the memory consumption.
Merge remote-tracking branch 'origin/master' into gh-pages