Issue 20380: more changes to analysis