SIT-461 + some updtes in documentation