Merge with sq/JSIL