Conflict fix of #2842 Hydro Tray Upgrades

pull request #2842