NWUKFS-299 Repackage