Partial support for 1.7.2