@polesye, thanks. If we're all on board with this approach, @valera-rozuvan, can you remove this feature flag and rely on my Sass fix?