Rebase on skeleton

### Feature Request

|    Q        |   A
|------------ | ------
| New Feature | yes
| RFC         | yes/no
| BC Break    | yes/no

#### Summary

Rebase on latest skeleton
Fields:
- label
- file uplaod
