User Story 1025 (issue #8)