[US20] do not force current value storage since it is done automatically