Add Attachment:STR-368: Do not generate undefine- and new- code for non-dependent dynamic rules