Add omitted changes from master