PR: 23424 Submitted by: FUJISHIMA Satsuki <k5@cheerful.com>
Submitted by: Ade Lovett <ade@lovett.com>