2013:03:06 12:02:08: Merge and land latest changes