GR-29  and GR-57

@jbirdjavi