Merge branch 'hotfix/another_fix_for_comparison' into dev