Workaround for implicit model delete.
Merge branch 'j3demo' of https://github.com/group-policy/neutron into j3demo