[Incomplete] Refactoring of the Nomenclature env
Merge remote-tracking branch 'origin/Office'