https://reviews.apache.org/r/9408/
Updated local.cpp