This code can be merged only after having deploying it ==> https://jira.corp.cloudwatt.com/browse/CAASCHR-319