Update Collection to master tip

Change-Id: I6fd75825699485c65a22e8470bf1a632336d1fae
Merge "Update Collection to master tip" into wmf/1.23wmf8