Bring ea-1268-staging branch up-to-date