[TIMODOPEN-383] Re-sending PR against master.