completed 1.9.5 milestone