Merge branch 'js/objc-funchdr'