Applied patch from 3.0.16 -> 3.0.96