Merge "expected.h - fix bugprone-branch-clone warning" into rvc-dev