Automated PR created via Copilot per user request: merge current branch into platform-dev. Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #331