Responded to #18905 in Gaia