[TASK] Adapt changes introduced by deferred rendering