[v5r1p1] bug fixes