#9831: Improve treasures