Merge "Bugfix: Ring volume stuck at zero on tangor" into main