Switching to 6.2.1 final