Final changes for the 3.0.12 update