Merge changes from topic 'report/html_table'