companion commit to nodebb/nodebb#4e55707, nodebb/nodebb#2011