[Delivers #172175110] Bring upstream changes from tempest

See merge request !9