sync CHANGES to 1b93faf567af83c17035f2f87f2db143e1746c47