Cleaner 1.7 support.