Restores documentation and codepro fixes that were mistakenly deleted in previous merge