applying patch from Sachith to AIRAVATA-1055