merge patch-5