7.x-1.3 cherry-picking

Grabbing the following commits for 7.x-1.3:

#93
#94
#97
#98
#99
#100