Closes #394270412419