Capella import fixes

Assorted Capella import fixes (#20891, 3, 4 and 5, plus a partial fix for #20896).