Merge "Use public interface for the following endpoints:"