Merge from master into ea-1268-staging