v1.7.5 merge