Add support for 25_STABLE