[WIP][CARA-1692] Fix/cara 1692