Merge commit 'origin/core51'