hack to store timestamp; try to understand why the hack is needed, but for now we have a working solution
updating to HEAD of 7_0_0_dev branch