Merge "Invalidate after changing ring path translation" into main