Merge "Add common "create_server_snapshot" method"