follow-up to latest master