review done. attribute should not be static
Merge branch 'master' into master2
Merge branch 'master' into master2
no more async loading