data_quality hotfix
Merge branch 'develop' - hotfix