Bug 40168 changes file