Probably! But that's a separate Pull Request since it's not related to this change :)