merge from master
remove timestamp (does not change a lot since the commit also change)