yyy (reverse-merged from commit c050483d43432822f0a30e9cbf555fdd589996ee)