Merge of O7.1.3 and O7.1.7