companion commit to nodebb/nodebb#298d904
companion commit to nodebb/nodebb#fa2bf7c