commit by porjdv on 15aug@17h30