HG-838 BRE

1) Fixed mess from initial checkin