Merge "Fix default grant running for secondary user."