Merge "Add timeout and timestamp for long duration tasks"