Merge "Change to mvn-targets"