#2839 - Adding in 5.2 again