Merge "Consider flags when mergine resource tables" into main