Merge "Clarified FillCallback and SaveCallback behaviors." into pi-dev