LPS-50644 Apply fix to DDL