case 3211 - Adaptation under latest alma changes. Code optimisations.
case 3211 - Removed empty id param.
Merge branch 'case-3211' into easy