add support for multiple handlers
Merge branch 'upload-destination-config'