Merge "Monkey season" into ics-mr1