26748 - fixed selected state
Manual merge and fix conflicts
Merge https://github.com/texasag/vn-toolbox-common.git master into vn-toolbox-common/master