Merge branch 'AIRAVATA-2520-bugfix' into develop