Base architecture fixes
Merged changes from meeting and Base changes