Feature/fix reversion 24

Make 2.4 compatible with reversion >= 1.8 while maintaining 1.7 compat