Fix rebase merge conflict
Fix rebase merge conflict

bytekast/cdf,miguelleite/cdf,gcnonato/cdf,webdetails/cdf,diogofscmariano/cdf,Aliaksandr-Kastenka/cdf,diogofscmariano/cdf,Tiger66639/cdf,akhayrutdinov/cdf,Tiger66639/cdf,krivera-pentaho/cdf,eliofreitas/cdf,Tiger66639/cdf,krivera-pentaho/cdf,jvelasques/cdf,eliofreitas/cdf,dcleao/cdf,webdetails/cdf,scottyaslan/cdf,miguelleite/cdf,jvelasques/cdf,plagoa/cdf,afrjorge/cdf,davidmsantos90/cdf,pamval/cdf,Aliaksandr-Kastenka/cdf,carlosrusso/cdf,scottyaslan/cdf,davidmsantos90/cdf,scottyaslan/cdf,akhayrutdinov/cdf,dcleao/cdf,carlosrusso/cdf,afrjorge/cdf,gcnonato/cdf,diogofscmariano/cdf,afrjorge/cdf,miguelleite/cdf,e-cuellar/cdf,carlosrusso/cdf,pedrofvteixeira/cdf,plagoa/cdf,gcnonato/cdf,webdetails/cdf,davidmsantos90/cdf,pedrofvteixeira/cdf,pedrofvteixeira/cdf,bytekast/cdf,akhayrutdinov/cdf,bytekast/cdf,pamval/cdf,pamval/cdf,jvelasques/cdf,plagoa/cdf,krivera-pentaho/cdf,eliofreitas/cdf,dcleao/cdf,e-cuellar/cdf,Aliaksandr-Kastenka/cdf,e-cuellar/cdf