Merge "Move COM tag parsing to constructor"