Pla 735 merged

DON'T MERGE before code review
@idradm