Merge "Improving TAPL messaging" into sc-dev