Fixes #6628
Fixes #6613 and #6492
Temp fix for Tajaran > Tajara breaking the whitelist.
Minor change based on diff
Removed Taj hackfix
Merge pull request #6633 from Zuhayr/dev-freeze

Xenomorph fixes, typing indicator fix, several incidental tweaks.