Attempts to bring into line with upstream (intelvwi) c70cc14