latest architecture changes
Latest merged fixes
Merged in files 3