Merge "Fix for P R O G U A R D Issues" into gingerbread