6.7.x compatibility
1.0.40