2nd update for current gx-common