3.5.2 upgrade & various changes