Merge "Fix compatibility with Tempest"