LQ : Bug Fixing R3 Issues. Source code checked in.(src folder).