@shacker  - Is there a way to wrap this in a feature flag?
Same with the JavaScript.

Right now both will be loaded no matter what, it's probably better to exclude them only when the feature flag is enabled