Merged in documentation branch for SDV-213