Clusters table with auto-update

Change-Id: I5c047928e0cff8a2ab838ec21593ffc85ee398ad
Merge "Clusters table with auto-update"