renamed variable (cherry-picked from b42ea7b)
Merge remote branch 'origin/master'