Still getting to know our new 31S. What I thought was water hammer was just some of the pipes rattling in the storage bays. Simply slid some lengths of pipe insulation over them.
Also replaced the black tank rinse fitting flap plug with a screw-in plug. Makes for less excess water in the wet Bay.