Merge "Improving TAPL error messages" into sc-dev