Resolving the merge conflict for BUG-14799 Switch Knox branch for Baikal