Merge "Wake-up after auth"