Merging 1.2.5
Merging 1.2.5
Full merge of 1.2.5