Merge "Lower commons-lang3 dependency"