Fixed loading bug
Merge branch 'master' into CMigration