Merge "Improving TAPL diagnostics" into sc-dev