[#2715] Updating table format
Merge branch '2.1' into 2.2