Revert "Revert "Merge branch 'development' into config-rewrite""

This reverts commit c64708b8b0d84a3b68296c9f95edc6cca976e0b7.