Feature work from Rihanna task branch
Automatically generated merge request from Rihanna assistant for the current rihanna/* task branch into main.
Automatically generated merge request from Rihanna assistant for the current rihanna/* task branch into main.