Fix compatibility with latest master (20.01-rc0)