There was quick fix for 1.9.2 that was a backport of #5316, but the proper fix for 1.10 is still open.