This seems has nothing to do with this pull request. 
Should we separate this into another pull request?