#822 - reference blog post, add addition feature flag