Security patch from 1.3.5 to 1.3.6