Update with main fork (Nov. 5-19)