Merge bug fix for #9063 to release