Merge "Upgrade lodash to 4.17.11"