Merge Slot documentation changes
merge rebase on Collect