merge with latest float-pc