[V2S1 US33] Changed listeners
Merge branch 'uri'