Fix for https://issues.infn.it/jira/browse/STOR-459
Merge branch 'fix/STOR-459' into develop