Markup under feature flag

Is this class included in this PR?