Merge "Adding more diags for TAPL actions" into sc-v2-dev