merged message cleanup from SonarBerserk