Merge into DEV by DEV TEAM C

Merge del sprint 4