catkinized package
merged with upstream