Fix code quality: self assignments
Merge pull request #8507 from skirpichev/self-assig-fix

Fix code quality: self assignments