(cherry picked from commit 3bd953be)
00c113e3 Applied patch changes de8f1f6e Made changes for table style