This should be pulled up to 1.9.4 and 1.10.1.