Merge commit 'snapshot-start' into stable