Feature implementation via Rihanna
This merge request was created by the Rihanna assistant to propose the latest changes from the current rihanna/* task branch into main.
This merge request was created by the Rihanna assistant to propose the latest changes from the current rihanna/* task branch into main.