case 3211 - Adaptation under latst alma changes.
Merge branch 'case-3211' into easy
Merge branch 'master' into easy
Merge remote-tracking branch 'origin/easy'