Assigned to Alex Merry
Link to original bug (#49380)
Make this depend on features we want to go in 2.3.