Merge master into no-reflect