Merge pull request #14539 from lparedes/master

Do not overwrite selected and disabled attributes