Reinstating getModel in controller to be able to delete packages
Merge remote-tracking branch 'upstream/develop' into develop