Cherry-pick ATMO-259 from Abyssinian to Herja