Don't add legacy models if shell_plus
Committed merge