Merge "Improve / fix docs" into sc-dev