merged s3import of harish into pooja branch