https://issues.apache.org/jira/browse/AIRAVATA-1055
https://issues.apache.org/jira/browse/AIRAVATA-1055