Armazenar fixes
Merge remote-tracking branch 'origin/alex'