Automatic merge from submit-queue Fixing timing issues with examples Partial fixes for examples tests.