branch_11A6

Consolidated Changes on branch_11A6