Backport ATMO-370 to Herja