fix
genstub and popup C code
work around
Merge branch 'develop'