Part 1 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with...