Merge connector change from mapjs