Merge "replace Thread sleep with Awaitility"