Merge "New user restrictions for EDU"