(ABM-269) Initial Emfac2011 Overhaul Commit
Merge branch 'wsu' into develop