update (reverse-merged from commit dd8629d2cab36c60599d9c20d352ad1cfbb13a4b)