fix for 7-1-stable-ms-dev