[xv/f36] (7 commits) ...Apply patches from multi-vendor collaboration effort