Merge master into ea-1268