GIA-3110 - Amendments for design errors on Comments