https://mattermost.atlassian.net/browse/MM-16024?searchSessionId=3940ccec-a159-4a9b-a503-e9fcfd1dc46f&searchObjectId=46205&searchContainerId=10302&searchContentType=issue