fixing the urgent bug in master
resolved merge conflict
finished release2_extras