I have created a patch which will close all other issues except the Comment #2