Update to latest specs
Apply CR
Merge pull request #430 from ogail/upload

Update to latest specs