Merge "Remove lodash in UI"