Fixed via https://github.com/discourse/discourse/commit/8404921b917c6c7ed9f079046f9b7b73c6fd7ddd
and
https://github.com/discourse/discourse/commit/12e71f1fb2d155a6b0fad93db6341cc841427156