DAR-2524 reapplying TOC fix which was lost during fluid preview merge