First sync merge with toolkit