Merge "Crash test when wait condition not met" into tm-dev