Task #5564

Added documentation and resolved code review issues.