Merge "Pass the size of the vatiable instead of a pointer to it" into pi-dev