Merge "Private API became public..."