Merge "Add debug logging to root cause tap issues" into main