TODO #182039836 - Video spacers