merge -r 723486:723487 from 1.2.x branch [CONTINUUM-1958] useEditMode option when releasing Submitted by Mateus Pimenta