For some reason the merge didn't pick up these changes...