8_4 Fix compatibility issues and performance improvement