Merge "Fix for the recent Tempest Test Failures"