[#2006] apply package_saver.py change to plugins.py (fix merge conflict)
[#2006] adjust for different model import