mkubecek Update to 6.3 final