Merge "Add const value for manually set surround formats." into pi-dev