Corrected issues with merge of 2.x changes