Merge "Add logout to System user logic" into main