case 3211 - Cache alma results. Separate fetchable data.
case 3211 - Temporary code cleanup.
case 3211 - Restored MC's changes.
Merge branch 'case-3211' into easy