Inline a local variable
Merge origin/master