Merge changes from topic "349794543" into main

* changes:
  Implement QQS for BC25
  Fix some organization of view model