Created attachment 703308 [details] test patch for 4.9.0-rc4 Attached here is a test patch which fixes the issue for me at 4.9.0-rc4.