Pull in changes from master to the refactor