joan 17:02
merged master 17:06