Merge "Default overrideUserWhenGranting to false." into sc-dev