Review Alex's changes, box LIVEOAK-661
LIVEOAK-280
Merge pull request #393 from cardosogabriel/master

Review Alex's changes, LO-661 and LO-280