Please separate out features and fixes into individual pull requests
and reference the issue if it exists.