temporarly add printout to see when AddPerson write queries finish (debug assist)
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'