I am moving this discussion to new pull request as well.