Diff moar-1.17.1 with a moar-1.30.0

Thank you!