Merge "Add features artifact"