Merge "Fix NPE when calling Session#add" into pi-dev