[1.7.x] Fixed #22833: Autodetector not doing through mapping correctly