fix the first and the last issues.
Defect: VIS-58
Authored by: namhm 2015-04-08
Parent: [r140]
Child: [r142]
