Merged from Blake’s master