TRUNK-2448 Adding uuid