Merge branch 'loadingRefactor' into dev