Merge branch 'aruizramon-status-updates-crm' into develop