merge soulwolf master for local build