Targets 5.2 as well because we want to deprecate things properly in 5.2 based on this 6.0 work.