Merge "Bump api master to 2.3.0-SNAPSHOT"