Merge pull request #6282 from dearblue/orphan-block