Merge "Further improving TAPL error messages" into sc-v2-dev