6ebdd1b08ec3156c637db59d6a42efc8fa63ab8f from master; fix failure to import some...