THREE-874: this message will end up in develop after the code review