4 Commits (fixes/4496-selectionmodel-issues)