Port regression fixes to 1.20 branch for issue 1195
This is fix for issue #1195 (closed) It is cherry-picked MR !715 (merged) from master branch.
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 fix for issue #1195 (closed) It is cherry-picked MR !715 (merged) from master branch.