fix broken usage of static and simplified DF support in SN
c3.2.4
Merge branch 'develop' into gh-pages