Merge commit '2.5.0' into moonshot-packaging-fixes