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