Added and manually tested up to and including 5.10