Author: see #87942