Merge branch 'thirdparty' into thirdparty_dev Source commit: 6371982d4538f2d8e2c52fe34065a9e1e535924b