[RFC] CARA-2244

Fix/cara 2244