Updated MEEGPIPE from upstream