Merge "fix for sync and passthough usecase"