TRAC #23577

On behalf of callow.mark@artspark.co.jp
Landed-by: Shannon Woods
Signed-off-by: Jamie Madill
Signed-off-by: Geoff Lang