Sourcestamp behaviour from upstream