s04-us59: completed user story
Merge remote-tracking branch 'origin/s04-us59' into dev-local