Merge "Increase wait times in TAPL" into sc-dev