INT-3133: Rebasing, polishing and documentation