Merge "Fix alerts when stack names contain '-'"