Closes #9894 Release Notes: - N/A ### Before  ### After 