Introduce make jar
merge bug26278 into default
merge default heads