merged with m8dugl-3.4.0-g71c77fc