Merged the changes. AIRAVATA-1471