Not working for 5.2 yet. Attempt to patch