Issue 5711 comment bug master25merge