Merge pull request #151 from dcleao/CDF-414

[CDF-414] e [CDF-415]
[ANALYZER-2285] - CGF