Add argument to upload-api:replace if exist
Merge branch 'poet' into 3.0