[CLEANUP] updates for 8.0 compatibility
[CLEANUP] updates for 8.0 compatibility

webdetails/cte,webdetails/cte,afrjorge/cte,pgoncalveswd/cte,pgoncalveswd/cte,afrjorge/cte,pgoncalveswd/cte,webdetails/cte,afrjorge/cte