Closes #9374: merge with 3.2