fixes in classes changes
Merge branch 'online_preproc' into testing_tmp

* online_preproc:
  fixes in classes changes