Tagged for version 0.6 with CR1.