Reuse const FindAttribute for non-const version thereof
Merge pull request #235 from Dmitry-Me/reuseFindAttribute

Reuse const FindAttribute for non-const version thereof