setting loading to be deferred
Merge branch 'dev'