Merge branch 'release/0.0.15' into develop
use original filename for backup instance name instead of hashed filename
Merge branch 'release/0.0.16'