[DF-185] Merged development into cubemapfbo