Adding compatibility with schema compare in 2.4
Merge branch 'hotfix-2.4-compatibility'