The changes related to moving the default values from the constructor to the properties should be reverted as it's not related to this PR and it's not consistent with the framework way of doing things.