#859: intermediate changes.
Denis Konovalyenko
Branch: DenisKonovalyenko/okapi:859
Branch: okapiframework/okapi:dev
Merged
Merged pull request
Merged in DenisKonovalyenko/okapi/859 (pull request #338)
Merged in DenisKonovalyenko/okapi/859 (pull request #338)
This is a partial solution for issue #859.