Merge package private interfaces into public ones. Related to [#1989] an...

...d [#1991]