Given there's too many changes in this branch that is not related, I think its best i close this pull request and recreate a new one with just the single commit.