Merge commit '1bcedcd09d9de4e055d8f9b4eb167691a44c7b98' into sync-0.8