Merge "Add member typedef referring to base interface"