Merge "Trying to wait for procedures"