Merge "Fix falling tapl tests" into main