Resolve code and documentation mismatches
Conclude merge