Fix bug on completed diagnosis with graph versions in conflict
Merge branch 'hotfix/v1.16.1'