20581 capx impl 3

Final updates to fix #20581. Capx files now import just like cap files.