Missing breaks added... It can be that this change breaks the functionality. It was made in order to fix some compiler warnings.
Authored by: alvarado 2018-07-01
Parent: [r3408]
Child: [r3410]