Loader and Room generateItem method
Merge branch 'master'
Merge branch 'master'
Lil optimalization