Merge "Two API changes:"