Merge commit 'a2353bfc447980f406de1adbe1963f818a8bfcd3' as 'pin-core'