Merge "fix maven local build issue"