fixing rendering issues HALO
Merging origin/dval/master-pending-rendering-issues into master