operations table
Merge branch 'hotfix/oper_table' into develop