Address type in review
Merge remote-tracking branch 'origin/master'