Add experimental 1.5.2 support