Merge "Add safe entity delete, fix multiple entity get"