Use new version stamp.
Merge latest from dev.