We had crashing issues tied to the right-click open-with context menu, and replacing the xml in the client seemed to help.