Merge "[DO NOT MERGE] Import Jack and Jill Brest 1.1-rc2"