Merge pull request #3928 from Nanai/dev-freeze

SM Fix for Dev-Freeze
Merge pull request #3929 from Nanai/dev-freeze

Additional SM bugs(hopefully) quashed
Further map patch!

Engipod fix - Remapped pod dock.

Filter now COMPLETELY fixed.

Issues with disposals possibly fixed.