Merge "Fix catalyst settings test failure" into main