Merge "Use internal version of getUserInfos"