Merge "Final adjustments to privacy metrics:" into rvc-dev