Resolved merge of performance-improvements into all-the-branches