[TIMODOPEN-317] Merging master into stable