- related to RTVTHREE-732, is this even needed?