Cherry pick 18b7515977d51fd0c4eddcdb6dbc50817334cbe6 (follows #94)