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