Fix #11635 / #11719.