FLUID-5022: Fix and test case for dynamic components targeted at non-options material