Republish Project Enhancement MetaSQL to address issues #21312, #21311, #21304