BAC-1005: merging to the current release

See #1967