Merge changes I3109a482,Ia5e25738

* changes:
  Final small cleanup.
  Actually change the place where updateSelection is called