Move out this file to separate pull request