Issue 3529 02 metrics squashed