Merge "Add metrics log for special cases" into rvc-dev