Try another way to force wait before steps.
Merge branch '5988' of github.com:openscholar/openscholar into 5988