altering a code file from master in release2_extras