Update feat. reports for classical
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-6222' into beta

* reosarevok-bitbucket/mbs-6222:
  Update feat. reports for classical