FIXED: 7.x - 11.1.x compatibility