Bug Fixes core: allow passing a custom type when template is null (#2126) (2129892), closes #2121 core: disabled expression should not overwrites child expr… (#2130) (f779edb), closes #2129 #2128