merge with master, with minor conflict fixes