Merge "Various API changes including:"