#8: using timestamp of header if possible
Merge branch 'using-header-stamp-id-8'