Review Alex's changes, box LIVEOAK-661
LIVEOAK-280