Update to latest core bind interface
Merge branch 'fix-update-to-latest-core'