Merge "Fixed an issue when pulling down from heads up" into pi-dev