test (reverse-merged from commit e66ce0bf7f0830b3ba57e5f29944dba65b06b474)