merge dev, 1.6.8.7