Reviewed: Updated function documentation in update function
Merge branch 'development' into core-pr-6