(ITS#6042) Microsoft compatibility patch