Merge pull request #18162 from romaimperator/master

Fixing numeric attrs when set to same negative value