Merge "Follow framework API changes"