Okey, I can land this change in this pull request. But please, in the future, when changing libs/core code use a different pull request than the one adding a module. It's a perfect example, where a core mixin is being modified, and this modification can be handled independently of the mode addition. Just to have into account in the future, please :)