[Design Refactor] different design changes (PG*, JL*)
Merge branch 'master' into DesignWorking