@gnugomez I'm reverting your patch since the existing tests never pass. Can you reapply your patch on the redesign branch instead?
redesign
This reverts commit 01796fc5.