Closes #7778134738448