refs #006, #007, #003, #004 da Sprint 3