Merge branch 'thirdparty_hotfix' into thirdparty Source commit: 992ff96dc38a04b2c9259bfc8b524f37f8b15720