merged upstream MEEGPIPE