Merge "Move interfaces to framework internal" into main