ref #2044 ref #2049 ref #2054 fixes #2046 fixes #2051 fixes #2056 (cherry picked from commit f6e99451) Conflicts: main/xen/APKBUILD