Please cherry pick commits ae16f332132a5eb1e3ff85a0c435dbe25a1d6299 574e716352290f9c34bfa7bd3134a13e0caa8da2.
Packaging fixes for usage server, but there are some code changes implemented to fix the startup. Cheers, Hugo
Please cherry pick commits ae16f332132a5eb1e3ff85a0c435dbe25a1d6299 574e716352290f9c34bfa7bd3134a13e0caa8da2.
Packaging fixes for usage server, but there are some code changes implemented to fix the startup. Cheers, Hugo