Merge "Add maven setting"