embedded installer merge from 1.8-akka branch