[server-21.1] Backports
A couple of backports that have landed into master branch recently.
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.
A couple of backports that have landed into master branch recently.