Integrate latest official changes