Well, the fix looks wrong and a proper one is probably more complicated than that. If CSP needs rootstore it probably can't work in a general case when called during the same rootstore initialization even if that doesn't deadlock (maybe this CSP doesn't do anything with the rootstore but it probably makes more sense to fix the issue in general). Probably the correct way would be to avoid loading (unbeeded?) CSPs during root store init somehow, although I now didn't look in details.