initial changes for 12.1.3
Finish change_for_12_1_3