- Small optimization
Merge remote-tracking branch 'upstream/master'
- Small optimization