fixed #21855 list relation selection
Merge branch '21855' into 21836a