Merge "Increase tag limitation to 1024" into main