Reworked for 3.0.12 upcoming release.