AD-21 #comment fixed on the branch. Since the code is quite different from the trunk merge will be done by hand