Changes to related and architecture (including YannisP's changes)