Merge commit 'snapstart' into stable