resync with c42 tweaks