Sush | #2105 | changes for packaging