Merge "Add diag for host-based input code" into main