companion commit to nodebb/nodebb@963428174b7c