ATLAS-2878: avoid retrieval of entiyWithExtInfo when extInfo is not needed

(cherry picked from commit 8e7ecf72f32ef6ca282a314d85761742e229a48b)
6 files changed