Some enhancements for Selections
See merge request !445 (merged)
(cherry picked from commit 5e185ce7)
3182e5ca Some enhancement for Selecitons 16941528 RebuildSelection: 4bc5a8d4 fix PayLoadSelection