Feature/zen 12224

specify that it is a guid maybe?