Merge branch 'patch/JAL-1791_timestamp' into Release_2_9_0b1_Branch