case 3211 - Adaptation under latst alma changes.
Merge branch 'case-3211' into easy