applied changes in relation to task https://issues.infn.it/jira/browse/STOR-103