Merge "Fix missing observer reply callbacks"