Remove unnecessary DB call
Remove unnecessary DB call
Remove unnecessary DB call
Merge branch 'dev'