Merge "Do not create snapshot on first init" into pi-dev