Merge "feat(ufs): adds timeout and error handling" into integration