Merge "Resa" to develop

Do code review and merge it into develop once everything is OK