GRD-16 merge fixes