1.13.2 - 10.6 support