More changes due to GORA-362