Issues/992@v2

After discussion in https://github.com/bem/bem-components/pull/474/files#r16985151

Closes #992

// cc @mishanga