Merge "Added in wait for attach context flag."