Merge "Refining mvn-param changes"