I am running into the same issue. Have you figured out a way to workaround this without modifying engine code?