[WIP] [CARA-1859] updates