Merge "Reducing max timeout in TAPL" into tm-qpr-dev