LPS-40888

Hi Brian,

As @brianchiu also have tested these commits. So I'm brave enough to send this pull directly to you.

This fixes DDL - Manage Data Definition regression which came out due the LPS-40666 header fix.