Merge commit 'cd2ede593acee9c4956c79da4377ce890ac3a9c0'
Merge commit '80d62f224900ab486a5bc5a6e80ce1e25a0e38e8' as 'externals/zycore'