Merge "Changed parent assumption to current context user from USER_SYSTEM" into main