Fixes #3427 : add a variable that contains the promises generation timestamp
merging 2.5 into master