Merge "Bug 569555 - more updates: re-order"