0.13.5-RC1 upgrade