merged the latest from cfpoi