FX-289
Merge pull request #106 from korst1k/dev

FX-289
FX-288
FX-289, FX-288, FX-287, FX-290, FX-291, FX-292, FX-293
rebased over dev