@has2k1 as this is now merged, the TODO should get a bugreport, so that it is not forgotten :-)