Merge tempest fixes from vedujoshi