Would it be possible to cherry pick https://github.com/discourse/discourse/commit/cafbb3aea77e087a1c9616f02b6be0979cd54241 and https://github.com/discourse/discourse/commit/95e8c935c55827e7495acc589dde4f8b7c26daae#diff-689419c27839146782821d1c1d093928 to stable?