various module and core upgrades to tr and sync with circle repo