3.6.3 upgrade