Merge branch 'SEN-5868' into 'master'

SEN-5868 - Ajustes solicitados

See merge request atii/ateg-offline-v2!125