Merge "Ensure members are non-null in callback" into pi-dev