Update inventory logic for uploading & cleaning
Merge remote-tracking branch 'origin/master'