Milyn 648

These fixes should also be applied to the v1.5.x-Branch.