Merge "Update lodash, moment to latest"