Merge "Shape tab" into main