merge CTS xfb fixes
This is the same as !273 (merged), but something's up with CI, so let's try to retrigger here.
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
This is the same as !273 (merged), but something's up with CI, so let's try to retrigger here.