MDL-1234 addodb: modification
Rangy mod
s3 changes