Merge Rihanna task branch into main

This merge request is for integrating the Rihanna task branch into the main branch as per the current task requirements. No merge or deployment action is required at this stage.