LPS-49166 - Modified regex in DDLRecord.macro