Adding `@author` tags to modified files. Remove Hamcrest usage. Original pull request #602 Related tickest #583