Merge "Refactor determine metric update status"