BC-2575 #resolve not use @class
Merge branch 'master' of git@github.com:soluvas/soluvas-framework.git