Problem for merge two forum

Just opened a PR, it should be merged soon :slight_smile:
https://github.com/discourse/discourse/pull/16685