fixing issue in which grouped single select option could not be closed
Merge remote-tracking branch 'origin/next-release' into next-release