DEV: master-discuss-refactoring

(UTC)