Pull in changes from main fork