r1440: GENSEC improvements: