Fix package generation to remove the hardcoded path to the feature
Merge remote-tracking branch 'origin/master'