Merge changes from topic "km/ffa_version"

* changes:
  refactor: FFA_VERSION related refactors
  feat: print file and line number if `expect` fails