[ELF-33] and [AH-1271][AH-1314]