Merge bug fix to Release; Fixes #8546