Closes #10641386370355