This is done as per the commits below
https://github.com/discourse/discourse-solved/commit/e9be43becd3630eeb05f81ee3c0149bf62e70bec
https://github.com/discourse/discourse/commit/135191d1d194b1cd03eb0416b5c4f7bf1a319aaf