Merge "Wait for refstack-client to finish"