Merge "Workaround for infinite loop issue" into tizen