Revert "Revert "Merge pull request #16 from ncharles/ust_3426/dev/3427_add_generation_timestamp_in_promises""
Sorry, I reverted the wrong commit

This reverts commit 2a1f7eca6fbac8ee4d6de559c6c526428c0c008e.