merge patch 5834