*8482* Final commits