Another round of fixes after merge
Loadable components to be in separted Spring component bundling
Fix issues after another round of merge