ENTRYSTORE-347 #resolve