Changes based on PR #9691