Update inline documentation
Merge in release branch 2.3.0 changes