Here are the remaning patches from the last watermark series. I did a few changes to the first one which caused some ripples throughout the series. I also spotted a small future proofing opportunity in patch 13, and I added a few function rename patches to the end.