Works with latest 2.8.12