Merge "Optimizing: Do not use range-based loop when inserting elements."