[addressess #78238810] merge did not take place from r89 to develop. fixing the missing fields