merge with package upstream