ACT-1918 added documentation
Merge with master