#7841 Finish Changes