Cam 2809

Sorry - this Pull request has the docs for two issues - no idea how to extract that into two pull requests. Maybe you could merge both in one go?