Manually merging 1.5 additions