companion commit to nodebb/nodebb@d22fe41, nodebb/nodebb#2080