Update
Relocate app-init
Code cleanup
Merge
relocate