Merge branch 'develop' into lbudginas/#461_operations_table_render_bug