Ok. I’ve filed a bug and it should be fixed for 5.7. You can track the progress of that bug here and if you wish to integrate the change to your repository, it should be pretty straightforward once the fix is in:
Unfortunately, it won’t be fixed for 5.6 since the severity of the bug is not particularly high. Hope that makes sense.