Note - depends on #28420