Revert "merge from development"

This reverts commit 4b05a221f520f37af33b77618a989545f8d33236, reversing
changes made to 51632b271ced1db58df8a3fbabf26d6d0c81016c.
listselector fix