GSB-CR - final commit