Issue 3597 master25