[TIMODOPEN-349, TIMODOPEN-354] Update stable with master