Merge branch 'develop' into lbudginas/#567_unify_table_styles