jbelleza-cce-fix into development

Definition of Done:

• Merge topic branch into development
• If there are new findings, attach justifications
• Assign label ~”Hardening::Approval”
• Merge development into master

#141 (closed) #140 (closed)