Merge "unhide J API"