Merge branch 'hotfix/deleting_comparison'