Data Loading Fix
Merge branch 'hotfix/RC-DataLoadFix'