These changes increase the scope and are not directly related to
the changes. Will move those as a follow up
This commit is intended to be squashed