Compatibility with EE 2.8.0 update