This and topicdata change were to address #595 .  These were assumed for the packaging ignores made below, so had to be merged in here.