Merge branch 'thirdparty_hotfix' into thirdparty Source commit: 517bf5cd57f2eff3cd92e6ce61c1a603e0e8875c